fix signals

1999-10-26  Havoc Pennington  <hp@pobox.com>

* src/gdk-pixbuf-loader.h: fix signals

* src/gdk-pixbuf-io.h: add new vtable fields

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f83c61cc2d6a8ac2208396c9db678a8789372144..7833a30a457644a5fdf5046e7c3b452045817563 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * src/gdk-pixbuf-loader.h: fix signals 
+
+       * src/gdk-pixbuf-io.h: add new vtable fields
+       
+
 1999-10-26  Jonathan Blandford  <jrb@redhat.com>
 
        * src/gdk-pixbuf-loader.h: New Class.  Beginning of progrssive

diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index a1397bd01ee747ecdd3a6cd9c377ba6543081bbc..3c9fafee48b95804f59065bb87e7437446be4258 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -26,6 +26,8 @@
 #include "gdk-pixbuf.h"
 #include <stdio.h>
 
+typedef void (* ModulePreparedNotifyFunc) (GdkPixbuf *pixbuf, gpointer user_data);
+
 typedef struct _ModuleType ModuleType;
 struct _ModuleType {
        char *module_name;
@@ -33,7 +35,14 @@ struct _ModuleType {
        GModule *module;
        GdkPixbuf *(* load) (FILE *f);
         GdkPixbuf *(* load_xpm_data) (const gchar **data);
+
+        /* Incremental loading */
+        gpointer   (* begin_load)    (ModulePreparedNotifyFunc func, gpointer user_data);
+        void       (* stop_load)     (gpointer context);
+        void       (* load_increment)(gpointer context, guchar *buf, guint size);
+        GdkPixbuf *(* get_pixbuf)    (gpointer context);
 };
 
 
 ModuleType *gdk_pixbuf_get_module (gchar *buffer, gint size);
+

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h
index 8cc9cc6be623db2a400ace4031a88911a4ca6b4a..8738c307ddf6b94b78b787146060f830a7768e4b 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -56,11 +56,10 @@ typedef struct _GdkPixbufLoaderClass GdkPixbufLoaderClass;
 struct _GdkPixbufLoaderClass {
        GtkObjectClass parent_class;
 
-       void (* area_updated) (GdkPixbufLoader *loader,
-                              int x, int y, int width, int height);
-       void (* area_prepared) (GdkPixbufLoader *loader,
-                               GdkPixbuf *image,
-                               int x, int y, int width, int height);
+       void (* area_prepared) (GdkPixbufLoader *loader);
+
+       void (* area_updated)  (GdkPixbufLoader *loader,
+                                int x, int y, int width, int height);
 };
 
 \f

diff --git a/gtk/gdk-pixbuf-loader.h b/gtk/gdk-pixbuf-loader.h
index 8cc9cc6be623db2a400ace4031a88911a4ca6b4a..8738c307ddf6b94b78b787146060f830a7768e4b 100644 (file)
--- a/gtk/gdk-pixbuf-loader.h
+++ b/gtk/gdk-pixbuf-loader.h
@@ -56,11 +56,10 @@ typedef struct _GdkPixbufLoaderClass GdkPixbufLoaderClass;
 struct _GdkPixbufLoaderClass {
        GtkObjectClass parent_class;
 
-       void (* area_updated) (GdkPixbufLoader *loader,
-                              int x, int y, int width, int height);
-       void (* area_prepared) (GdkPixbufLoader *loader,
-                               GdkPixbuf *image,
-                               int x, int y, int width, int height);
+       void (* area_prepared) (GdkPixbufLoader *loader);
+
+       void (* area_updated)  (GdkPixbufLoader *loader,
+                                int x, int y, int width, int height);
 };
 
 \f